Merge "Follow-up a43af3bc: Add Import integration test"